Make file descriptors close-on-exec when possible.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 7 Jul 2013 18:00:14 +0000 (11:00 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 7 Jul 2013 18:00:14 +0000 (11:00 -0700)
commitcb2abbc2bd10c62ca0a9bf19c14da22b43e4b638
tree67e3c9ef514ce944fbbafaca8b99fde7a84f1bca
parent47b734aebae163d4818742a9fa0bd6bd4d6cbdf4
Make file descriptors close-on-exec when possible.

This simplifies Emacs a bit, since it no longer needs to worry
about closing file descriptors by hand in some cases.
It also fixes some unlikely races.  Not all such races, as
libraries often open files internally without setting
close-on-exec, but it's an improvement.
* admin/merge-gnulib (GNULIB_MODULES): Add fcntl, pipe2.
(GNULIB_TOOL_FLAGS): Avoid binary-io, close.  Do not avoid fcntl.
* configure.ac (mkostemp): New function to check for.
(PTY_OPEN): Pass O_CLOEXEC to posix_openpt.
* lib/fcntl.c, lib/getdtablesize.c, lib/pipe2.c, m4/fcntl.m4:
* m4/getdtablesize.m4, m4/pipe2.m4: New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* nt/gnulib.mk: Remove empty gl_GNULIB_ENABLED_verify section;
otherwise, gnulib-tool complains given close-on-exec changes.
* nt/inc/ms-w32.h (pipe): Remove.
* nt/mingw-cfg.site (ac_cv_func_fcntl, gl_cv_func_fcntl_f_dupfd_cloexec)
(gl_cv_func_fcntl_f_dupfd_works, ac_cv_func_pipe2): New vars.
* src/alloc.c (valid_pointer_p) [!WINDOWSNT]:
* src/callproc.c (Fcall_process) [!MSDOS]:
* src/emacs.c (main) [!DOS_NT]:
* src/nsterm.m (ns_term_init):
* src/process.c (create_process):
Use 'pipe2' with O_CLOEXEC instead of 'pipe'.
* src/emacs.c (Fcall_process_region) [HAVE_MKOSTEMP]:
* src/filelock.c (create_lock_file) [HAVE_MKOSTEMP]:
Prefer mkostemp with O_CLOEXEC to mkstemp.
* src/callproc.c (relocate_fd) [!WINDOWSNT]:
* src/emacs.c (main): Use F_DUPFD_CLOEXEC, not plain F_DUPFD.
No need to use fcntl (..., F_SETFD, FD_CLOEXEC), since we're
now using pipe2.
* src/filelock.c (create_lock_file) [! HAVE_MKOSTEMP]:
Make the resulting file descriptor close-on-exec.
* src/lisp.h, src/lread.c, src/process.c (close_load_descs, close_process_descs):
* src/lread.c (load_descriptor_list, load_descriptor_unwind):
Remove; no longer needed.  All uses removed.
* src/process.c (SOCK_CLOEXEC): Define to 0 if not supplied by system.
(close_on_exec, accept4, process_socket) [!SOCK_CLOEXEC]:
New functions.
(socket) [!SOCK_CLOEXEC]: Supply a substitute.
(Fmake_network_process, Fnetwork_interface_list):
(Fnetwork_interface_info, server_accept_connection):
Make newly-created socket close-on-exec.
* src/sysdep.c (emacs_open, emacs_fopen):
Make new-created descriptor close-on-exec.
* src/w32.c (fcntl): Support F_DUPFD_CLOEXEC well enough for Emacs.
* src/w32.c, src/w32.h (pipe2): Rename from 'pipe', with new flags arg.
28 files changed:
ChangeLog
admin/ChangeLog
admin/merge-gnulib
configure.ac
lib/fcntl.c [new file with mode: 0644]
lib/getdtablesize.c [new file with mode: 0644]
lib/gnulib.mk
lib/pipe2.c [new file with mode: 0644]
m4/fcntl.m4 [new file with mode: 0644]
m4/getdtablesize.m4 [new file with mode: 0644]
m4/gnulib-comp.m4
m4/pipe2.m4 [new file with mode: 0644]
nt/ChangeLog
nt/gnulib.mk
nt/inc/ms-w32.h
nt/mingw-cfg.site
src/ChangeLog
src/alloc.c
src/callproc.c
src/emacs.c
src/filelock.c
src/lisp.h
src/lread.c
src/nsterm.m
src/process.c
src/sysdep.c
src/w32.c
src/w32.h